Avoid a crash

svn path=/trunk/; revision=20863

diff --git a/ChangeLog b/ChangeLog
index a85af01a7a0bfc042d392653b57e7d522cf33a14..053a0a9a3d42c017cd2c9d18b79cc21c5f34db19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 543217 – GTK application crashed with directfb backend
+
+       *  gdk/directfb/gdkvisual-directfb.c: Avoid a crash in
+       _gdk_visual_init().  Patch by Huimin He.
+
 2008-07-18  Federico Mena Quintero  <federico@novell.com>
 
        * demos/gtk-demo/changedisplay.c (find_toplevel_at_pointer): Don't

diff --git a/gdk/directfb/gdkvisual-directfb.c b/gdk/directfb/gdkvisual-directfb.c
index ae5800d01d4cd93849f4f76a2a78f80a4079c7d5..43ecb83b4dcc94ec2c0a31098a1bac6347e7673f 100644 (file)
--- a/gdk/directfb/gdkvisual-directfb.c
+++ b/gdk/directfb/gdkvisual-directfb.c
@@ -137,7 +137,7 @@ _gdk_visual_init ()
      to ensure the base format ARGB LUT8 RGB etc then add ones supported
      by the hardware
    */
-  for (i = 0, c = 0; i < G_N_ELEMENTS (formats); i++)
+  for (i = 0; i < G_N_ELEMENTS (formats); i++)
     {
       IDirectFBSurface    *src;
       DFBAccelerationMask  acc;
@@ -157,8 +157,7 @@ _gdk_visual_init ()
 
       if (acc & DFXL_BLIT || formats[i] == dlc.pixelformat)
         {
-            system_visual = GDK_VISUAL (visuals[c]);
-          c++;
+                       system_visual = GDK_VISUAL (visuals[i]);
         }
 
       src->Release (src);